fix the console when only XEN_PHYSDEV_ACCESS is Yes.

Signed-off-by: Vincent Hanquez <vincent@xensource.com>

diff --git a/linux-2.6-xen-sparse/arch/xen/i386/kernel/setup.c b/linux-2.6-xen-sparse/arch/xen/i386/kernel/setup.c
index fe63fe98469a0307770e55957739d7f8a30489e5..aeef736bd30b05b2377852f2fa4f3833167e8781 100644 (file)
--- a/linux-2.6-xen-sparse/arch/xen/i386/kernel/setup.c
+++ b/linux-2.6-xen-sparse/arch/xen/i386/kernel/setup.c
@@ -1752,7 +1752,7 @@ void __init setup_arch(char **cmdline_p)
 #endif
 #endif
        } else {
-#ifdef CONFIG_XEN_PRIVILEGED_GUEST
+#ifdef CONFIG_XEN_PHYSDEV_ACCESS
                extern const struct consw xennull_con;
                extern int console_use_vt;
 #if defined(CONFIG_VGA_CONSOLE)

diff --git a/linux-2.6-xen-sparse/drivers/xen/console/console.c b/linux-2.6-xen-sparse/drivers/xen/console/console.c
index 7ba0fed9ed32e9dcc54360a00aa34669b6b275c8..137af277f3df0d9fd91a66049e3acfb55ba0fda5 100644 (file)
--- a/linux-2.6-xen-sparse/drivers/xen/console/console.c
+++ b/linux-2.6-xen-sparse/drivers/xen/console/console.c
@@ -579,7 +579,7 @@ static struct tty_operations xencons_ops = {
        .wait_until_sent = xencons_wait_until_sent,
 };
 
-#ifdef CONFIG_XEN_PRIVILEGED_GUEST
+#ifdef CONFIG_XEN_PHYSDEV_ACCESS
 static const char *xennullcon_startup(void)
 {
        return NULL;